From: Kenichi Handa <handa@etlken>
Date: Mon, 10 May 2010 04:14:21 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~506^2~14
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c1dddd629223cd26dca2ff5e5abd3e74b6cbf49e;p=emacs.git

merge trunk
---

c1dddd629223cd26dca2ff5e5abd3e74b6cbf49e